multi-tun support for windows #1020
Conversation
| @@ -561,9 +567,9 @@ static bool process_tunnel_commands(const tunnel_command *tnl_cmd, command_cb cb | |||
| add_id_req->identifier = strdup(new_identifier); | |||
| add_id_req->identifier_file_name = strdup(new_identifier_name); | |||
| add_id_req->jwt_content = strdup(tunnel_add_identity_cmd.jwtContent); | |||
| add_id_req->use_keychain = tunnel_add_identity_cmd.useKeychain; | |||
|
|
|||
| add_id_req->use_keychain = true; | |||
| size_t sockfilebase_len = strlen(sockfilebase); | ||
| size_t eventsockfilebase_len = strlen(eventsockfilebase); | ||
|
|
||
| sockfile = calloc(socket_path_len + sockfilebase_len + ipc_discriminator_len + 1, sizeof(char)); |
There was a problem hiding this comment.
why allocate just to print it below? however it is populated it can be logged directly
also this is a memory leak
| f = model_list_it_element(it); | ||
| it = model_list_it_remove(it); | ||
| ZITI_LOG(INFO, "zet [%d] IPC found at: %s%c%s", idx++, SOCKET_PATH, PATH_SEP, f); | ||
| char *ipc = calloc(100, sizeof(char)); |
There was a problem hiding this comment.
seems only use to format and log, just log info directly
| @@ -2125,12 +2299,15 @@ static int version_opts(int argc, char *argv[]) { | |||
| int c, option_index, errors = 0; | |||
| optind = 0; | |||
|
|
|||
| while ((c = getopt_long(argc, argv, "v", | |||
| while ((c = getopt_long(argc, argv, "v:P:", | |||
There was a problem hiding this comment.
v does not take arg does not need : after it
| @@ -43,6 +43,8 @@ extern "C" { | |||
| #define MAXPATHLEN PATH_MAX | |||
| #endif | |||
|
|
|||
| #define DEFAULT_EXECUTABLE_NAME "ziti-edge-tunnel" | |||
| @@ -201,6 +203,7 @@ extern void ziti_tunnel_set_log_level(int lvl); | |||
| typedef void (*ziti_tunnel_async_fn)(uv_loop_t *loop, void *ctx); | |||
| extern void ziti_tunnel_async_send(tunneler_context tctx, ziti_tunnel_async_fn f, void *arg); | |||
|
|
|||
| size_t find_other_zets(model_list* ipcs, const char* base, const char* prefix); | |||
There was a problem hiding this comment.
wrong place -- should not be in the library code
|
|
||
| char* get_config_file_name() { | ||
| if (config_dir != NULL) { | ||
| char* config_file_name = calloc(FILENAME_MAX, sizeof(char)); |
There was a problem hiding this comment.
this is a bad practice -- since it's sometimes allocated that caller has no idea if it can be freed
| LIST_INSERT_HEAD(&load_list, inst, _next); | ||
| } | ||
| exit_loop: |
There was a problem hiding this comment.
exit_loop is not exiting loop? misleading
| @@ -1102,36 +1112,39 @@ static void load_identities(uv_work_t *wr) { | |||
|
|
|||
| uv_dirent_t file; | |||
| while (uv_fs_scandir_next(&fs, &file) == 0) { | |||
| ZITI_LOG(TRACE, "processing file: %s %d", file.name, rc); | |||
| char* file_as_identifier = malloc(MAXPATHLEN); | |||
| } | ||
|
|
||
| char actual_config_dir[FILENAME_MAX]; | ||
| realpath(path, actual_config_dir); |
There was a problem hiding this comment.
should we check the return value of realpath?
| #elif __unix__ || unix || ( __APPLE__ && __MACH__ ) | ||
| #include <grp.h> | ||
| #include <sys/un.h> | ||
| #define SOCKET_PATH "/tmp/.ziti" |
There was a problem hiding this comment.
SOCKET_PATH is used in at least one #ifdef. Changing it from a macro to a variable inadvertently eviscerates make_socket_path()
| uv_fs_t fs; | ||
| int rc = uv_fs_scandir(uv_default_loop(), &fs, SOCKET_PATH, 0, NULL); | ||
| if (rc < 0) { | ||
| ZITI_LOG(ERROR, "failed to scan dir[%s]: %d/%s", ipc_base, rc, uv_strerror(rc)); |
There was a problem hiding this comment.
This should probably be debug or lower
| initialize_instance_config(config_dir); | ||
|
|
||
| model_list ipc_list = {0}; | ||
| size_t other_zets = find_other_zets(&ipc_list, SOCKET_PATH, sockfilebase); |
There was a problem hiding this comment.
find_other_zets ends up being called twice. First in configure_ipc, and then again here.
| model_list_append(ipcs, strdup(file.name)); | ||
| } | ||
| } | ||
| return model_list_size(ipcs); |
There was a problem hiding this comment.
The default socket files in /tmp/.ziti are not removed when zet exits on linux/darwin, which makes the list size one even if there is no running zet.
still can debate the name "ipc-discriminator". Nothing new has come to mind yet but there is probably something better. If no discriminator is passed the legacy path is used. This will keep things backward compatible when only one tun is running and the UI should also "just work".